merge with xen-unstable.hg
authorawilliam@xenbuild2.aw <awilliam@xenbuild2.aw>
Thu, 22 Feb 2007 17:15:29 +0000 (10:15 -0700)
committerawilliam@xenbuild2.aw <awilliam@xenbuild2.aw>
Thu, 22 Feb 2007 17:15:29 +0000 (10:15 -0700)

Trivial merge